From 5f5c07ebeaf761e1e4419b358fda06b57983abd5 Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Sun, 10 Mar 2013 18:36:26 +0000 Subject: [PATCH] remove some forced formatting in the new gpx writer. this required reference file changes which were manually validated. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4344 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/gpx.cc | 9 - gpsbabel/reference/LineStyles.gpx | 3045 ++++++----------- gpsbabel/reference/basecamp~gpx.gpx | 6 +- gpsbabel/reference/bushnell_trl.gpx | 379 +- gpsbabel/reference/ggv_ovl~ovl.gpx | 393 +-- gpsbabel/reference/ik3d-sample.gpx | 216 +- gpsbabel/reference/tpo-sample3.gpx | 803 ++--- gpsbabel/reference/track/jogmap-gpx.gpx | 140 +- gpsbabel/reference/track/mapbar~gpx.gpx | 198 +- .../reference/track/trk_reverse_test-rev.gpx | 104 +- gpsbabel/testo.d/classic-4.test | 2 +- gpsbabel/testo.d/tpo.test | 8 +- 12 files changed, 1946 insertions(+), 3357 deletions(-) diff --git a/gpsbabel/gpx.cc b/gpsbabel/gpx.cc index 19d247877..cc2cfedb3 100644 --- a/gpsbabel/gpx.cc +++ b/gpsbabel/gpx.cc @@ -1819,15 +1819,6 @@ gpx_track_disp(const waypoint* waypointp) writer.writeAttribute("lat", toString(waypointp->latitude)); writer.writeAttribute("lon", toString(waypointp->longitude)); - // FIXME: this is technically not needed. - // Our Pre-Qt XML writer would write - // - // - // even thogh is more compact and legal (assuming there - // are no child tags, of course. This is to bridge our exsiting test suite - // during the transition to QXmlStreamWriter to force an explict closing tag. - writer.writeCharacters("\n"); - gpx_write_common_position(waypointp, " "); /* These were accidentally removed from 1.1 */ diff --git a/gpsbabel/reference/LineStyles.gpx b/gpsbabel/reference/LineStyles.gpx index acdf9b872..83b26e45f 100644 --- a/gpsbabel/reference/LineStyles.gpx +++ b/gpsbabel/reference/LineStyles.gpx @@ -1,1988 +1,1087 @@ - - - - - 2.000000 - HairDash0 - HairDash0 - HairDash0 - - - 3.000000 - ThinDash0 - ThinDash0 - ThinDash0 - - - 4.000000 - RedHair0 - RedHair0 - RedHair0 - - - 8.000000 - RedThin0 - RedThin0 - RedThin0 - - - 21.000000 - RedMed0 - RedMed0 - RedMed0 - - - 64.000000 - RedThick0 - RedThick0 - RedThick0 - - - 125.000000 - YellowMed0 - YellowMed0 - YellowMed0 - - - 61.000000 - GreenMed0 - GreenMed0 - GreenMed0 - - - 39.000000 - BlueMed0 - BlueMed0 - BlueMed0 - - - 37.000000 - PurpleMed0 - PurpleMed0 - PurpleMed0 - - - 59.000000 - BlackMed0 - BlackMed0 - BlackMed0 - - - 49.000000 - WhiteMed0 - WhiteMed0 - WhiteMed0 - - - NOTE 1 - 12 test lines - see notes with GPX sample!! four line widths for solid red two line widths for dashed red seven colors for medium width Note that line names have nothing at all to do with line style attributes! These are named for convenient cross-reference, but keep in mind that "red med" is a line label and "Red Medium" is a style label. Waypoints are generated by Topo to exactly match the first track point. Apparently only GPX and KML output from GPSBabel retain track descriptions?? - 12 test lines - see notes with GPX sample!! four line widths for solid red two line widths for dashed red seven colors for medium width Note that line names have nothing at all to do with line style attributes! These are named for convenient cross-reference, but keep in mind that "red med" is a line label and "Red Medium" is a style label. Waypoints are generated by Topo to exactly match the first track point. Apparently only GPX and KML output from GPSBabel retain track descriptions?? - - - NOTE 2 - how GPX from GPSBabel shows Topo track desc as of 2012: (line name and line style are NOT related to actual color or width) <trk> <name>red line</name> <desc>Style=red med, Width=3, Dashed=0, Color=#ff0000</desc> <number>1</number> <trkseg> ... (Topo menu colors are stored in the file as web-style hex RGB) Red=#ff0000, Yellow=#ffff00, Green=#008000, Blue=#000080, Purple=#800080, Black=#000000, White=#ffffff (Topo solid line widths: Hairline=1, Thin=2, Medium=3, Thick=4) (Topo dashed line widths: Hairline=1, Thin=2) SRE's tpo.c mod stuffs Style/Width/Dashed/Color fields into "desc" field under the assumption that something will post-process GPX or KML output and move information from desc to private extensions (solid lines have "Dashed=0", can have width of 1=hairline to 4=thick) (dashed lines have "Dashed=1", can only have width of 1=hairline or 2=thin) - how GPX from GPSBabel shows Topo track desc as of 2012: (line name and line style are NOT related to actual color or width) <trk> <name>red line</name> <desc>Style=red med, Width=3, Dashed=0, Color=#ff0000</desc> <number>1</number> <trkseg> ... (Topo menu colors are stored in the file as web-style hex RGB) Red=#ff0000, Yellow=#ffff00, Green=#008000, Blue=#000080, Purple=#800080, Black=#000000, White=#ffffff (Topo solid line widths: Hairline=1, Thin=2, Medium=3, Thick=4) (Topo dashed line widths: Hairline=1, Thin=2) SRE's tpo.c mod stuffs Style/Width/Dashed/Color fields into "desc" field under the assumption that something will post-process GPX or KML output and move information from desc to private extensions (solid lines have "Dashed=0", can have width of 1=hairline to 4=thick) (dashed lines have "Dashed=1", can only have width of 1=hairline or 2=thin) - - - NOTE 3 - how KML from GPSBabel shows Topo track desc as of 2012: (see important notes with GPX sample, all of them apply here!) (note that GPSBabel forces all track styles to be the same - why?) <Folder> <name>Tracks</name> <Folder> <name>red line</name> <snippet/> <description> <![CDATA[<table> <tr><td><b>Description</b> Style=Red Medium, Width=3, Dashed=0, Color=#ff0000 </td></tr> <tr><td><b>Distance</b> 1.3 mi </td></tr> </table>]]> </description> <Folder> <name>Points</name> <Placemark> <name>red line-0</name> ... - how KML from GPSBabel shows Topo track desc as of 2012: (see important notes with GPX sample, all of them apply here!) (note that GPSBabel forces all track styles to be the same - why?) <Folder> <name>Tracks</name> <Folder> <name>red line</name> <snippet/> <description> <![CDATA[<table> <tr><td><b>Description</b> Style=Red Medium, Width=3, Dashed=0, Color=#ff0000 </td></tr> <tr><td><b>Distance</b> 1.3 mi </td></tr> </table>]]> </description> <Folder> <name>Points</name> <Placemark> <name>red line-0</name> ... - - - NOTE 4 - how MapSource 6.16.3 adds color to a track as of 2012: (color choices are Dark Gray, Red, Green, Yellow, Blue, Magenta, Cyan, White, Transparent) (should be easy to turn desc tag into their extension, but better to directly write track styles) <trk> <name>Hwy 50 from Placerville</name> <extensions> <gpxx:TrackExtension xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3"> <gpxx:DisplayColor>Red</gpxx:DisplayColor> </gpxx:TrackExtension> </extensions> <trkseg> ... - how MapSource 6.16.3 adds color to a track as of 2012: (color choices are Dark Gray, Red, Green, Yellow, Blue, Magenta, Cyan, White, Transparent) (should be easy to turn desc tag into their extension, but better to directly write track styles) <trk> <name>Hwy 50 from Placerville</name> <extensions> <gpxx:TrackExtension xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3"> <gpxx:DisplayColor>Red</gpxx:DisplayColor> </gpxx:TrackExtension> </extensions> <trkseg> ... - - - red thick - Style=Red Thick, Width=4, Dashed=0, Color=#ff0000 -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + 2.000000 + HairDash0 + HairDash0 + HairDash0 + + + 3.000000 + ThinDash0 + ThinDash0 + ThinDash0 + + + 4.000000 + RedHair0 + RedHair0 + RedHair0 + + + 8.000000 + RedThin0 + RedThin0 + RedThin0 + + + 21.000000 + RedMed0 + RedMed0 + RedMed0 + + + 64.000000 + RedThick0 + RedThick0 + RedThick0 + + + 125.000000 + YellowMed0 + YellowMed0 + YellowMed0 + + + 61.000000 + GreenMed0 + GreenMed0 + GreenMed0 + + + 39.000000 + BlueMed0 + BlueMed0 + BlueMed0 + + + 37.000000 + PurpleMed0 + PurpleMed0 + PurpleMed0 + + + 59.000000 + BlackMed0 + BlackMed0 + BlackMed0 + + + 49.000000 + WhiteMed0 + WhiteMed0 + WhiteMed0 + + + NOTE 1 + 12 test lines - see notes with GPX sample!! four line widths for solid red two line widths for dashed red seven colors for medium width Note that line names have nothing at all to do with line style attributes! These are named for convenient cross-reference, but keep in mind that "red med" is a line label and "Red Medium" is a style label. Waypoints are generated by Topo to exactly match the first track point. Apparently only GPX and KML output from GPSBabel retain track descriptions?? + 12 test lines - see notes with GPX sample!! four line widths for solid red two line widths for dashed red seven colors for medium width Note that line names have nothing at all to do with line style attributes! These are named for convenient cross-reference, but keep in mind that "red med" is a line label and "Red Medium" is a style label. Waypoints are generated by Topo to exactly match the first track point. Apparently only GPX and KML output from GPSBabel retain track descriptions?? + + + NOTE 2 + how GPX from GPSBabel shows Topo track desc as of 2012: (line name and line style are NOT related to actual color or width) <trk> <name>red line</name> <desc>Style=red med, Width=3, Dashed=0, Color=#ff0000</desc> <number>1</number> <trkseg> ... (Topo menu colors are stored in the file as web-style hex RGB) Red=#ff0000, Yellow=#ffff00, Green=#008000, Blue=#000080, Purple=#800080, Black=#000000, White=#ffffff (Topo solid line widths: Hairline=1, Thin=2, Medium=3, Thick=4) (Topo dashed line widths: Hairline=1, Thin=2) SRE's tpo.c mod stuffs Style/Width/Dashed/Color fields into "desc" field under the assumption that something will post-process GPX or KML output and move information from desc to private extensions (solid lines have "Dashed=0", can have width of 1=hairline to 4=thick) (dashed lines have "Dashed=1", can only have width of 1=hairline or 2=thin) + how GPX from GPSBabel shows Topo track desc as of 2012: (line name and line style are NOT related to actual color or width) <trk> <name>red line</name> <desc>Style=red med, Width=3, Dashed=0, Color=#ff0000</desc> <number>1</number> <trkseg> ... (Topo menu colors are stored in the file as web-style hex RGB) Red=#ff0000, Yellow=#ffff00, Green=#008000, Blue=#000080, Purple=#800080, Black=#000000, White=#ffffff (Topo solid line widths: Hairline=1, Thin=2, Medium=3, Thick=4) (Topo dashed line widths: Hairline=1, Thin=2) SRE's tpo.c mod stuffs Style/Width/Dashed/Color fields into "desc" field under the assumption that something will post-process GPX or KML output and move information from desc to private extensions (solid lines have "Dashed=0", can have width of 1=hairline to 4=thick) (dashed lines have "Dashed=1", can only have width of 1=hairline or 2=thin) + + + NOTE 3 + how KML from GPSBabel shows Topo track desc as of 2012: (see important notes with GPX sample, all of them apply here!) (note that GPSBabel forces all track styles to be the same - why?) <Folder> <name>Tracks</name> <Folder> <name>red line</name> <snippet/> <description> <![CDATA[<table> <tr><td><b>Description</b> Style=Red Medium, Width=3, Dashed=0, Color=#ff0000 </td></tr> <tr><td><b>Distance</b> 1.3 mi </td></tr> </table>]]> </description> <Folder> <name>Points</name> <Placemark> <name>red line-0</name> ... + how KML from GPSBabel shows Topo track desc as of 2012: (see important notes with GPX sample, all of them apply here!) (note that GPSBabel forces all track styles to be the same - why?) <Folder> <name>Tracks</name> <Folder> <name>red line</name> <snippet/> <description> <![CDATA[<table> <tr><td><b>Description</b> Style=Red Medium, Width=3, Dashed=0, Color=#ff0000 </td></tr> <tr><td><b>Distance</b> 1.3 mi </td></tr> </table>]]> </description> <Folder> <name>Points</name> <Placemark> <name>red line-0</name> ... + + + NOTE 4 + how MapSource 6.16.3 adds color to a track as of 2012: (color choices are Dark Gray, Red, Green, Yellow, Blue, Magenta, Cyan, White, Transparent) (should be easy to turn desc tag into their extension, but better to directly write track styles) <trk> <name>Hwy 50 from Placerville</name> <extensions> <gpxx:TrackExtension xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3"> <gpxx:DisplayColor>Red</gpxx:DisplayColor> </gpxx:TrackExtension> </extensions> <trkseg> ... + how MapSource 6.16.3 adds color to a track as of 2012: (color choices are Dark Gray, Red, Green, Yellow, Blue, Magenta, Cyan, White, Transparent) (should be easy to turn desc tag into their extension, but better to directly write track styles) <trk> <name>Hwy 50 from Placerville</name> <extensions> <gpxx:TrackExtension xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3"> <gpxx:DisplayColor>Red</gpxx:DisplayColor> </gpxx:TrackExtension> </extensions> <trkseg> ... + + + red thick + Style=Red Thick, Width=4, Dashed=0, Color=#ff0000 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - yellow med - Style=Yellow Medium, Width=3, Dashed=0, Color=#ffff00 -2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + yellow med + Style=Yellow Medium, Width=3, Dashed=0, Color=#ffff00 + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - blue med - Style=Blue Medium, Width=3, Dashed=0, Color=#000080 -3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + blue med + Style=Blue Medium, Width=3, Dashed=0, Color=#000080 + 3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - black med - Style=Black Medium, Width=3, Dashed=0, Color=#000000 -4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + black med + Style=Black Medium, Width=3, Dashed=0, Color=#000000 + 4 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - red med - Style=Red Medium, Width=3, Dashed=0, Color=#ff0000 -5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + red med + Style=Red Medium, Width=3, Dashed=0, Color=#ff0000 + 5 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - red thin - Style=Red Thin, Width=2, Dashed=0, Color=#ff0000 -6 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + red thin + Style=Red Thin, Width=2, Dashed=0, Color=#ff0000 + 6 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - red hair - Style=Red Hairline, Width=1, Dashed=0, Color=#ff0000 -7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + red hair + Style=Red Hairline, Width=1, Dashed=0, Color=#ff0000 + 7 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - thin dash - Style=Red Thin Dashed, Width=2, Dashed=1, Color=#ff0000 -8 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + thin dash + Style=Red Thin Dashed, Width=2, Dashed=1, Color=#ff0000 + 8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - hair dash - Style=Red Hairline Dashed, Width=1, Dashed=1, Color=#ff0000 -9 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + hair dash + Style=Red Hairline Dashed, Width=1, Dashed=1, Color=#ff0000 + 9 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - green med - Style=Green Medium, Width=3, Dashed=0, Color=#008000 -10 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + green med + Style=Green Medium, Width=3, Dashed=0, Color=#008000 + 10 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - purple med - Style=Purple Medium, Width=3, Dashed=0, Color=#800080 -11 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + purple med + Style=Purple Medium, Width=3, Dashed=0, Color=#800080 + 11 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - white med - Style=White Medium, Width=3, Dashed=0, Color=#ffffff -12 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + white med + Style=White Medium, Width=3, Dashed=0, Color=#ffffff + 12 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gpsbabel/reference/basecamp~gpx.gpx b/gpsbabel/reference/basecamp~gpx.gpx index 605dd8d31..ac0b6cca3 100644 --- a/gpsbabel/reference/basecamp~gpx.gpx +++ b/gpsbabel/reference/basecamp~gpx.gpx @@ -78,10 +78,8 @@ - - - - + + diff --git a/gpsbabel/reference/bushnell_trl.gpx b/gpsbabel/reference/bushnell_trl.gpx index aab0c7b32..58436ae35 100644 --- a/gpsbabel/reference/bushnell_trl.gpx +++ b/gpsbabel/reference/bushnell_trl.gpx @@ -1,253 +1,134 @@ - - - - - TL003 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + TL003 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gpsbabel/reference/ggv_ovl~ovl.gpx b/gpsbabel/reference/ggv_ovl~ovl.gpx index 2f1851062..c11d2aa22 100644 --- a/gpsbabel/reference/ggv_ovl~ovl.gpx +++ b/gpsbabel/reference/ggv_ovl~ovl.gpx @@ -1,234 +1,179 @@ - - - - - Route 1 - - RPT001 - - - RPT002 - - - RPT003 - - - RPT004 - - - RPT005 - - - RPT006 - - - RPT007 - - - RPT008 - - - RPT009 - - - RPT010 - - - RPT011 - - - RPT012 - - - RPT013 - - - RPT014 - - - RPT015 - + + + + Route 1 + + RPT001 + + + RPT002 + + + RPT003 + + + RPT004 + + + RPT005 + + + RPT006 + + + RPT007 + + + RPT008 + + + RPT009 + + + RPT010 + + + RPT011 + + + RPT012 + + + RPT013 + + + RPT014 + + + RPT015 + - - Route 2 - - RPT016 - - - RPT017 - - - RPT018 - - - RPT019 - - - RPT020 - + + Route 2 + + RPT016 + + + RPT017 + + + RPT018 + + + RPT019 + + + RPT020 + - - Route 3 - - RPT021 - - - RPT022 - - - RPT023 - - - RPT024 - + + Route 3 + + RPT021 + + + RPT022 + + + RPT023 + + + RPT024 + - - Route 4 - - RPT025 - - - RPT026 - - - RPT027 - - - RPT028 - - - RPT029 - + + Route 4 + + RPT025 + + + RPT026 + + + RPT027 + + + RPT028 + + + RPT029 + - - Track 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + Track 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - Track 2 - - - - - - - - - - - - - - - - - - - - - - - - - - + + Track 2 + + + + + + + + + + + + + + - - Track 3 - - - - - - - - - - - - - - + + Track 3 + + + + + + + + diff --git a/gpsbabel/reference/ik3d-sample.gpx b/gpsbabel/reference/ik3d-sample.gpx index c479286ac..7be336df5 100644 --- a/gpsbabel/reference/ik3d-sample.gpx +++ b/gpsbabel/reference/ik3d-sample.gpx @@ -1,139 +1,87 @@ - - - - - Jahnstrasse - Jahnstrasse 11 - Jahnstrasse 11 - - - Liebknechtstrasse - Liebknechtstrasse 90 - Liebknechtstrasse 90 - - - NARVA - Start - Start - - - NARVA to Jahnstrasse - - - - - - - - - - - - - - - - - - - - - - + + + + Jahnstrasse + Jahnstrasse 11 + Jahnstrasse 11 + + + Liebknechtstrasse + Liebknechtstrasse 90 + Liebknechtstrasse 90 + + + NARVA + Start + Start + + + NARVA to Jahnstrasse + + + + + + + + + + + + - - ACTIVE LOG 006 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + ACTIVE LOG 006 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gpsbabel/reference/tpo-sample3.gpx b/gpsbabel/reference/tpo-sample3.gpx index 0892eab60..b861e0b31 100644 --- a/gpsbabel/reference/tpo-sample3.gpx +++ b/gpsbabel/reference/tpo-sample3.gpx @@ -1,503 +1,354 @@ - - - - 2428.000000 - 001 - 001 - 001 - - - 2439.000000 - 002 - 002 - 002 - - - 2462.000000 - 003 - WITH MESSAGE - WITH MESSAGE - - - 2559.000000 - GPSRTE0 - GPSRTE0 - GPSRTE0 - - - 2582.000000 - GPSRTE1 - GPSRTE1 - GPSRTE1 - - - 2586.000000 - GPSRTE2 - GPSRTE2 - GPSRTE2 - - - 2612.000000 - GPSRTE3 - GPSRTE3 - GPSRTE3 - - - 2606.000000 - GPSRTE4 - GPSRTE4 - GPSRTE4 - - - 2632.000000 - GPSRTE5 - GPSRTE5 - GPSRTE5 - - - 2627.000000 - GPSRTE6 - GPSRTE6 - GPSRTE6 - - - 2622.000000 - GPSRTE7 - GPSRTE7 - GPSRTE7 - - - 2639.000000 - GPSRTE8 - GPSRTE8 - GPSRTE8 - - - 2599.000000 - GPSRTE9 - GPSRTE9 - GPSRTE9 - - - NOTE 1 - This is a note that has a photo attached - This is a note that has a photo attached - w:\photo.jpg - - - NOTE 2 - 2nd note, with link to a web page - 2nd note, with link to a web page - http://www.defghi.org - - - NOTE 3 - 3rd note, with a link to a document - 3rd note, with a link to a document - c:document.txt - - - SYM 1 - SYM 1 - SYM 1 - - - SYM 2 - SYM 2 - SYM 2 - - - SYM 3 - SYM 3 - SYM 3 - - - SYM 4 - SYM 4 - SYM 4 - - - TXT 1 - test - test - - - TXT 2 - test2 with new style - test2 with new style - - - TXT 3 - 2.55 miles - 2.55 miles - - - RTE 1 - 1 - + + + 2428.000000 + 001 + 001 + 001 + + + 2439.000000 + 002 + 002 + 002 + + + 2462.000000 + 003 + WITH MESSAGE + WITH MESSAGE + + 2559.000000 GPSRTE0 - - + GPSRTE0 + GPSRTE0 + + 2582.000000 GPSRTE1 - - + GPSRTE1 + GPSRTE1 + + 2586.000000 GPSRTE2 - - + GPSRTE2 + GPSRTE2 + + 2612.000000 GPSRTE3 - - + GPSRTE3 + GPSRTE3 + + 2606.000000 GPSRTE4 - - + GPSRTE4 + GPSRTE4 + + 2632.000000 GPSRTE5 - - + GPSRTE5 + GPSRTE5 + + 2627.000000 GPSRTE6 - - + GPSRTE6 + GPSRTE6 + + 2622.000000 GPSRTE7 - - + GPSRTE7 + GPSRTE7 + + 2639.000000 GPSRTE8 - - + GPSRTE8 + GPSRTE8 + + 2599.000000 GPSRTE9 - + GPSRTE9 + GPSRTE9 + + + NOTE 1 + This is a note that has a photo attached + This is a note that has a photo attached + w:\photo.jpg + + + NOTE 2 + 2nd note, with link to a web page + 2nd note, with link to a web page + http://www.defghi.org + + + NOTE 3 + 3rd note, with a link to a document + 3rd note, with a link to a document + c:document.txt + + + SYM 1 + SYM 1 + SYM 1 + + + SYM 2 + SYM 2 + SYM 2 + + + SYM 3 + SYM 3 + SYM 3 + + + SYM 4 + SYM 4 + SYM 4 + + + TXT 1 + test + test + + + TXT 2 + test2 with new style + test2 with new style + + + TXT 3 + 2.55 miles + 2.55 miles + + + RTE 1 + 1 + + 2559.000000 + GPSRTE0 + + + 2582.000000 + GPSRTE1 + + + 2586.000000 + GPSRTE2 + + + 2612.000000 + GPSRTE3 + + + 2606.000000 + GPSRTE4 + + + 2632.000000 + GPSRTE5 + + + 2627.000000 + GPSRTE6 + + + 2622.000000 + GPSRTE7 + + + 2639.000000 + GPSRTE8 + + + 2599.000000 + GPSRTE9 + - - crazy route 4.49 miles long - Style=GrnMedium, Width=3, Dashed=0, Color=#008000 -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + crazy route 4.49 miles long + Style=GrnMedium, Width=3, Dashed=0, Color=#008000 + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - TRK 2 - Style=GrnMedium, Width=3, Dashed=0, Color=#008000 -2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + TRK 2 + Style=GrnMedium, Width=3, Dashed=0, Color=#008000 + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - TRK 3 - Style=GrnMedium, Width=3, Dashed=0, Color=#008000 -3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + TRK 3 + Style=GrnMedium, Width=3, Dashed=0, Color=#008000 + 3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gpsbabel/reference/track/jogmap-gpx.gpx b/gpsbabel/reference/track/jogmap-gpx.gpx index 119171faf..41bee7a5b 100644 --- a/gpsbabel/reference/track/jogmap-gpx.gpx +++ b/gpsbabel/reference/track/jogmap-gpx.gpx @@ -1,94 +1,54 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gpsbabel/reference/track/mapbar~gpx.gpx b/gpsbabel/reference/track/mapbar~gpx.gpx index 9025584e3..254490a6f 100644 --- a/gpsbabel/reference/track/mapbar~gpx.gpx +++ b/gpsbabel/reference/track/mapbar~gpx.gpx @@ -10,138 +10,72 @@ 山顶到豆腐花 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gpsbabel/reference/track/trk_reverse_test-rev.gpx b/gpsbabel/reference/track/trk_reverse_test-rev.gpx index 2517f809f..00496852a 100644 --- a/gpsbabel/reference/track/trk_reverse_test-rev.gpx +++ b/gpsbabel/reference/track/trk_reverse_test-rev.gpx @@ -1,67 +1,49 @@ - - - - - track one - - - - - - - - - - - - - - - - + + + + track one + + + + + + + + + + - - track two - - - - - - - - - - - - - - - - + + track two + + + + + + + + + + - - track three - - - - - - - - - - - - - - - - + + track three + + + + + + + + + + diff --git a/gpsbabel/testo.d/classic-4.test b/gpsbabel/testo.d/classic-4.test index c2a0876e7..135011791 100644 --- a/gpsbabel/testo.d/classic-4.test +++ b/gpsbabel/testo.d/classic-4.test @@ -50,7 +50,7 @@ compare ${TMPDIR}/mtk_logger_gp245.gpx ${REFERENCE}/track/mtk_logger_gp245.gpx # MagicMaps IK3D Project File .ikt test # gpsbabel -i ik3d -f ${REFERENCE}/ik3d-sample.ikt -o gpx -F ${TMPDIR}/ik3d-sample.gpx -compare ${TMPDIR}/ik3d-sample.gpx ${REFERENCE}/ik3d-sample.gpx +compare ${REFERENCE}/ik3d-sample.gpx ${TMPDIR}/ik3d-sample.gpx # Exif format test (read only) gpsbabel -i exif -f ${REFERENCE}/IMG_2065.JPG -o unicsv,utc=0 -F ${TMPDIR}/exif-dat.csv diff --git a/gpsbabel/testo.d/tpo.test b/gpsbabel/testo.d/tpo.test index 07491881e..3a774d1d5 100644 --- a/gpsbabel/testo.d/tpo.test +++ b/gpsbabel/testo.d/tpo.test @@ -8,7 +8,7 @@ # Version 2.x tests rm -f ${TMPDIR}/tpo-sample1.gpx ${TMPDIR}/tpo-sample2.tpo gpsbabel -t -i tpo2 -f ${REFERENCE}/track/tpo-sample1.tpo -o gpx -F ${TMPDIR}/tpo-sample1.gpx -compare ${TMPDIR}/tpo-sample1.gpx ${REFERENCE}/track/tpo-sample1.gpx +compare ${REFERENCE}/track/tpo-sample1.gpx ${TMPDIR}/tpo-sample1.gpx #gpsbabel -t -i gpx -f reference/track/tpo-sample2.gpx -o tpo2 -F ${TMPDIR}/tpo-sample2.tpo #bincompare ${TMPDIR}/tpo-sample2.tpo reference/track/tpo-sample2.tpo # @@ -18,8 +18,8 @@ rm -f ${TMPDIR}/tpo-sample3.gpx ${TMPDIR}/tpo-sample3.gpx2 gpsbabel -t -r -w -i tpo3 -f ${REFERENCE}/tpo-sample3.tpo -o gpx -F ${TMPDIR}/tpo-sample3.gpx # Remove the timestamp grep -v time <${TMPDIR}/tpo-sample3.gpx >${TMPDIR}/tpo-sample3.gpx2 -compare ${TMPDIR}/tpo-sample3.gpx2 ${REFERENCE}/tpo-sample3.gpx +compare ${REFERENCE}/tpo-sample3.gpx ${TMPDIR}/tpo-sample3.gpx2 # Verify that tpo3 line styles convert sensibly. gpsbabel -t -w -r -i tpo3 -f ${REFERENCE}/LineStyles.tpo -o gpx -F ${TMPDIR}/LineStyles.gpx -o kml -F ${TMPDIR}/LineStyles.kml -compare ${TMPDIR}/LineStyles.gpx ${REFERENCE}/LineStyles.gpx -compare ${TMPDIR}/LineStyles.kml ${REFERENCE}/LineStyles.kml +compare ${REFERENCE}/LineStyles.gpx ${TMPDIR}/LineStyles.gpx +compare ${REFERENCE}/LineStyles.kml ${TMPDIR}/LineStyles.kml -- 2.30.2